src: drop some dead assignments

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
index ba1bd64b512077bc9d5d5759c70f81106254473e..51e5d1099c3a5d6892677baffbff64925aafd132 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -743,10 +743,7 @@ process_one_rollsum (OstreeRepo                       *repo,
         }
 
       if (!reading_payload)
-        {
-          g_string_append_c (current_part->operations, (gchar)OSTREE_STATIC_DELTA_OP_UNSET_READ_SOURCE);
-          reading_payload = TRUE;
-        }
+        g_string_append_c (current_part->operations, (gchar)OSTREE_STATIC_DELTA_OP_UNSET_READ_SOURCE);
 
       { guint64 remainder = tmp_to_len - writing_offset;
         if (remainder > 0)

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index f5ce6e9c6bfac69304aa1ec035ba6e91b83bc2e3..4d59a0355fdf7c9dc247009d138a74cddbcb8236 100644 (file)
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1744,7 +1744,6 @@ ostree_sysroot_deploy_tree (OstreeSysroot     *self,
   gs_unref_object OstreeRepo *repo = NULL;
   gs_unref_object GFile *osdeploydir = NULL;
   gs_unref_object GFile *deployment_var = NULL;
-  gs_unref_object GFile *deployment_etc = NULL;
   gs_unref_object GFile *commit_root = NULL;
   gs_unref_object GFile *tree_kernel_path = NULL;
   gs_unref_object GFile *tree_initramfs_path = NULL;
@@ -1826,8 +1825,6 @@ ostree_sysroot_deploy_tree (OstreeSysroot     *self,
   g_clear_object (&self->sepolicy);
   self->sepolicy = g_object_ref (sepolicy);
 
-  deployment_etc = g_file_get_child (new_deployment_path, "etc");
-
   if (!selinux_relabel_var_if_needed (self, sepolicy, deployment_var,
                                       cancellable, error))
     goto out;

diff --git a/src/libostree/ostree-sysroot-upgrader.c b/src/libostree/ostree-sysroot-upgrader.c
index 81f5ff2b39841f2043a4fe74dae8b620a4225050..997ea6bd6b33a4dc87b2fa25012afd38ec8fb977 100644 (file)
--- a/src/libostree/ostree-sysroot-upgrader.c
+++ b/src/libostree/ostree-sysroot-upgrader.c
@@ -115,8 +115,6 @@ ostree_sysroot_upgrader_initable_init (GInitable        *initable,
   OstreeSysrootUpgrader *self = (OstreeSysrootUpgrader*)initable;
   OstreeDeployment *booted_deployment =
     ostree_sysroot_get_booted_deployment (self->sysroot);
-  gs_unref_object GFile *deployment_path = NULL;
-  gs_unref_object GFile *deployment_origin_path = NULL;
 
   if (booted_deployment == NULL && self->osname == NULL)
     {
@@ -145,9 +143,6 @@ ostree_sysroot_upgrader_initable_init (GInitable        *initable,
       goto out;
     }
 
-  deployment_path = ostree_sysroot_get_deployment_directory (self->sysroot, self->merge_deployment);
-  deployment_origin_path = ostree_sysroot_get_deployment_origin_path (deployment_path);
-
   self->origin = ostree_deployment_get_origin (self->merge_deployment);
   if (!self->origin)
     {